Tidepool sync 2026-05-11#32
Open
loopkitdev wants to merge 40 commits into
Open
Conversation
…t-store LOOP-4735 CGM Event Store
…t-store LOOP-4735 CGM Event Store
…m-package LOOP-4781 Types moved to LoopAlgorithm
…m-package LOOP-4781 Types moved to LoopAlgorithm
* async updates * Changes for protocol updates
* async updates * Changes for protocol updates
Resolved source + pbxproj conflicts. Source resolutions: - MinimedPumpManager.swift: kept DIY for all 3 regions — preserves CAGE/IAGE tracking (commit ff07802); dropped Tidepool's duplicate isInoperable property (DIY already had it). - MinimedKitUI/Views/MinimedPumpSettingsViewModel.swift: took Tidepool (trivial whitespace). pbxproj: only conflicts were preserving LOCALIZATION_PREFERS_STRING_CATALOGS in Debug/Release configs (rule 5). No source-file refs in conflict.
The 2026-05-11 tidepool sync conflict resolution used git checkout --theirs on this file because the only conflict marker was a trivial whitespace hunk (an extra blank line). But that whole-file checkout wiped DIY's CAGE/IAGE viewModel additions outside the conflict region: - @published var timeSinceLastSetChange: String? - @published var timeSinceLastRewind: String? - formatDateToDaysHours(_:) helper - Init + state-observer wiring for both properties MinimedPumpSettingsView still references these properties so the build broke. Restored the file to DIY's pre-merge version (tidepool-sync/2026-03-10) which already has Tidepool's import/QuantityFormatter migrations plus DIY's CAGE/IAGE work.
This was referenced May 20, 2026
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refreshed Tidepool → DIY sync from the
tidepool-sync/2026-05-11branch.This supersedes and replaces the previous Tidepool Merge PR (#15), which is being closed in favor of this one.